From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 26 Mar 2025 12:44:03 +0000 (+0100)
Subject: gui/macOS: Improve overall memory management in XPCUtils::getDomainManagers
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2^2~62^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com///%22http:/www.example.com/cgi/%22https:/www.github.com/?a=commitdiff_plain;h=1b296b4afc5b41d164bff474a122ce9ca3b01aea;p=nextcloud-desktop.git

gui/macOS: Improve overall memory management in XPCUtils::getDomainManagers

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/macOS/fileproviderxpc_mac_utils.mm b/src/gui/macOS/fileproviderxpc_mac_utils.mm
index 4549f4853..344031144 100644
--- a/src/gui/macOS/fileproviderxpc_mac_utils.mm
+++ b/src/gui/macOS/fileproviderxpc_mac_utils.mm
@@ -30,7 +30,7 @@ Q_LOGGING_CATEGORY(lcFileProviderXPCUtils, "nextcloud.gui.macos.fileprovider.xpc
 NSArray<NSFileProviderManager *> *getDomainManagers()
 {
     dispatch_group_t group = dispatch_group_create();
-    __block NSMutableArray<NSFileProviderManager *> *managers = NSMutableArray.array;
+    __block NSMutableArray<NSFileProviderManager *> *const managers = NSMutableArray.array;
 
     dispatch_group_enter(group);
 
@@ -45,8 +45,11 @@ NSArray<NSFileProviderManager *> *getDomainManagers()
         for (NSFileProviderDomain *const domain in domains) {
             qCInfo(lcFileProviderXPCUtils) << "Got domain" << domain.identifier;
             NSFileProviderManager *const manager = [NSFileProviderManager managerForDomain:domain];
-            [manager retain];
-            [managers addObject:manager];
+            if (manager) {
+                [managers addObject:manager];
+            } else {
+                qCWarning(lcFileProviderXPCUtils) << "Could not get manager for domain" << domain.identifier;
+            }
         }
 
         dispatch_group_leave(group);